tweaks and changes
add todos