Commit fixes and improvements to issue 53, credit DexX