Further: General Bug fixes

General Bug Fixes.