Cleanup + Bug fixes