+ fixes to system
+ remove infinite loop