Preparing for new base and fixing bugs

-Eqdkp 5 by mindhaxor
-Aroma bugs fixed
Merge pull request #1 from Kevindeving/master

Preparing for new base and fixing bugs