[Change/FIx] Major improvement with fixes, help etc...

Signed-off-by: Oleg Komarov <o.komarov11@imperial.ac.uk>