Fixed two massive bugs.
Just need to finalise messaging and release.