homework fixes