several bugfies