various bugfies