few bugfixes, requires testing