bugfixes, should be working now .. again