fixed map
removed bad views
some helpers orders
ugh