lots of small little improvements

Signed-off-by: Felix Gabel <felix.gabel@me.com>