Fixes and Updates

* Optimization updates by Sampriti
* Small change to HOA title standard