fixes the -partly badly loaded objects- problem
small stylistic fix
some stylistic fixes
snapshot
mergin master
mode setting works now accross