lots of small improvements

Signed-off-by: Thierry Le Moulec <thierry@smoothie-creative.com>