Added a series of minor fixes and interface updates