minor changes
controls
merged switches patch
merged banmaster patch
merge switches patch #2
other patches