adding more aliases, commiting todos