merged develop
some more errors with "high" priority