removing beams
adding filter
fixing up more mappings