hopefully removed last remaining &s, closes #34