Adjusting version down to 2.0.1
fixing build errors
fixing build issues