Fixed the new features.
Had mised some variables and gotten my if statements wrong.