Bug fixes and more :v