Fixed stuff

Integrate to master