More minor cleanup and added a few TODO items.