Fixes and improvements to interface