some minor mods/extra comments and code on final test, realised error with what was there before, think this is better
(#524)