v2.1 is just about done to fix issues