added todo items
various tweaks