some small basic functionality fixes