Remove tildes, add a couple of shortcuts