Various fixes, multi level functionality