Some basic changes; user model; initial target setting