Added solution file, subtitles and cleaned up a bit