Fixed bugs, Final Push