minor functionality improvements