Fixed problems with the shitty GitHub

Added edits by Sham and Lou, kept changes made by me