Small fixes. Ready to release this version