updated images
updated templates
cleanup