Code tweaks and fixes, continued cleanup of @todos