added cartodb layer, cleanup