tweaks and more ideas/todos