Several bug fixes
Beta 1 release