Bug Squashes

- Fixed a few bugs over the past couple of days.