Fixed various choking issues
Merging