Fix collision in commands
Add more terms to date time parser