adding cl-match dependency
cosmetic fixes
adding some sweet macro