Improvements

Signed-off-by: Steven Prins <mail@stevenprins.com>