Fixed some more changes. Sprint 1 complete-ish?

Meh did what I could. Its still buggy, but config works properly and
update is functionalish. Add course is changed a little better imho.