A few bugfixes, all issue tracker issues resolved