Some small changes

back-up, preparing for the real stuff.


Signed-off-by: VandeurenGlenn <vandeurenglenn@gmail.com>