Fixed Problems

Last commit had errors due to bad merge non conflicting changes