small enhacements