small fixes, some more drawing funcs