Minor bugfixes, help interface improved