Fix small issues
Fix more small issues
Fix more small issues
Finished