fixed jumping + added some short hand ifs