Master

Mostly boring stuff.
The second last commit makes the ending quest work.
Anyone feel like recording a speed run? ;)