some changes to make things show up, added temporary template placeholders