bugfix + load on start

bugfixes and load onstart