seventh homework + fixes