Update to 1.1

Do some cleanups