updated und to LANGUAGE NON for proper api usage
moved field preprocess out of tempalte and into template includes
cleaned up formating and made calls to vars consistent