Dev Sync (18)

Bug Fixes, Error Checking, etc.