chg: dev: small bugfixes