Added support for N/A option, cleaned up templates, fixed scoring bug