Minor changes. Removed test project from the workspace. Fixed comments.