Cleaning up the interface, fixing bugs.