Last updates before initial relaease