bugfix
rework instance loading
cleanup
refactoring
cleanup
weekend stuff