version 2.1.0

minor improvements, cleaned up code