APIGW-945: cleared some todos, added logging, changed a few variable names that seemed to make assumptions about age limits