lots of page template fixes and code cleanup
add option to use excerpts