Update to 1.1 plus general clean up / features