Severall Fixes Commit