Small Changes

Various Bug Fixes