Add a couple more methods and fix some old ones.