V1RC1 feedback

Bugs solving and improvements