(#8) changelog
(#8) clean up the mess