Code formatting + more features