Various bug fixes, most notably CTW maps all seem to work