more bugfixes
blob