bug fixes for age