some homework fixes