Refactoring the plugin progress updates, ticket #64
Fixed bugs from last commit.