major bug fixes-half way to beta :D