Cleaned up some positions
Generalized dunks and shots to a net param