A bit more work on install subcommand
Fixed imports (I think)