Misc. improvements and fixes, optimisation
Merge branch 'master' of https://github.com/sbhs-forkbombers/sbhs-timetable