Beta
Minor bugfixes