beta added, bugfixes