A lot of small and big improvements.

Signed-off-by: Rick Kerkhof <rick.2889@gmail.com>