Some quick fixes from yesterday's work, plus basic templating stuff