Bug fixes and improvements
Trying to delete stuff ;_;