Made some API changes based on Peach comments.