Various pre-release bug fixes 1
simplify / reword warning checking somewhat