Further updates to minor functionality