class renaming
friendly progress output Fixes #2