adding changes suggested by Grey Knight
lots of changes, new template in progress