fixing stuff and preparing for beta release.