Fixed some of the model classes a little.
Merge https://github.com/Hopur42/G42SubtitleProject