Cleaned up a bit.
Fixed up some methods that weren't updated to use new id method.