Add-on fixes

human formatting over places