Minor updates STILL NOT RELEASE REDY