Bug fixes and other shit
Commit before work