Upgraded version info and release notes, cleaned code