Updated readme, minor code comments/clean up