Puck bugfixing WIP