a lot bugfixes and new stuff