Various updates
TODO update and various cleanup