various bugfixes
resolved conflicts