small functionality improvements