Minor interface tweaks
Made some preliminary interface updated for #31 - close