A couple of small improvements and bugfixes here and there. v1.2