More refactoring (OMG these {} & camel case functions are killing me) and fixed backspace... again?