More Bug fixes cause some stuff wasn't pushed