Restored some of my moronic changes which removed one commit of
improvements and bug fixes