Bug fixes and further PONG optimization