Improved interface, added help