some tweaks and TODO items