Bug Fixing

Nothing fixed more probably broke well aware of what's happening though