big cleanup and version 2.0/2.1 update