uran bugfix
several bugfixes
Merge commit 'df9c49056cc2dc94ddb31a007935b4c0ba28df69'