More fixes!
Also some cleanup regarding bosses ;_;