Bug fixes, improvements to interface