Fixes and minor improvements
Update 3.1 minor bug fix
Update 3.0 minor bug fix
Update 2.0 minor bug fixes