README

Updated readme and minor bug fixes.