bugfixes, works now