Implemented more buttons, more bugfixes