tweaks and todo