Add auto Capitalize and improve commands