Various bug fixes, levelling