Some Template fixes and WIP Greylist