Change directory location, now uses aggregate field, fixed minor bugs