Made a few minor changes to the interface