Fixed enrollment rule processing. More improvements to overall site. Ready for AWS testing