No more BETA

Coding and updtaes