Puma 160 done, move some parameters around
closes #3
fixes #4
fixes #5