General Bug Fixing

Fixes from use.