Add ability to provide target class kind
Fix (hopefully) spec descriptions