Fixed a few problems per Lab 0 Feedback #1