structural refactoring, annoying server crashes solved