Updated README, TODO, minor bug fixes