Adding MAX_PUCKS and some puck handling