lots of little fixes

covering packages in my class this week!