Fix what I broke

Roland's fix of what I broke :/
ignore
Can get zero as an answer
Fixed merge error

Idk why but i got a merge error that lead to heads all over the page
Almost-functional submenu
Minor change
Possible infinity bug fix

Check for yourself
Testing my first commit..
Fixed merge errors