Updated to new beta
Added some stuff
minor fixes