'play' cleaned up, params shifted around a bit