more bugfixes, good working state i tink