implemented some more stuff ...