made usage a bit cleaner and added some meaningful shortcuts