[PATCH 2/3] use of new macros for disk partition checking, minor language updates