Added filter and map functions
Buffed flares
Yay for manual merging