Complete commit #31 and minor interface fixes