some minor fixies