Preparing for new base and fixing bugs

-Eqdkp 5 by mindhaxor
-Aroma bugs fixed