Fixed missing kind info
Cleanups
Tweaks