minor improvements
correct type