Changes to priority, fixed cli stuff