Optimised imports, cleaned up the cli and updated the manual.