_base updated and other

Signed-off-by: Joachim Doerr <mail@joachim-doerr.com>