Better CLI, work on website