fix usage example and some cosmetic stuff