Initial commit
Minor bugfixes