Some enhancements to the previous "home" commit.

Signed-off-by: Sven Rissmann <creaworld-media@gmx.de>