updated diary, cleaned up cs1_task04