fixes and small improvements
minor fixes