fixing attr and .map issues