Fixes and improved interface