* some minor fixes