Bug fixes and cleanup

Bit of a code cleanup
Fixed progress for task
Fixed 'Enable scrobbling for this user' not being checked when it should