Small bugfixes/clarity