week10 and some week9 fixes

iamdabes