enhancements and fixed bug in AA male calculation
Updates