made some final changes for beta delivery