Added aisle numbers and a few bug fixes