small fixes and normilization