Bug Fixes

Fixed some small bugs within the system. Tested.