Clean up
Clean up
Bug fixes, alot