Clean up
Fix option type
Fix options
Added module:list command