Aroma : Fix some errors, add some more checks and move stuff for clearer future edition

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>