add fetching all areas, general cleanup