added small improvements