Bugs fixes and co.