Updated interface, fixed docs.