Minor updates.
Pulled in some functionality from the work profile.