Fixed the bugs, Buttons work, no errors - performance seems much much better?