Clean up

Comments were moved, CHANGELOG.txt added and README.md updated. Code
should be far cleaner now, leaving everything ready for following
changes.