Language tweaks, closes #189