Code release

Bunch of fixes