added some small improvements