more clean ups

Used demo from Poole
New template...thanks Poole