comments whee
merged commented code and fixed jumping