Minor code updates and fixes to readme