Fixed many things (too long)

Signed-off-by: tyloo <jbonva@gmail.com>