last fixes, prod version :)