Poor message corrected
Quieten down notice messages
tidy up where notice issues
TODO list update