Updated README; minor code changes