fix a couple of bugs and add in convenience objects