added subject and task objects, minor user fixes