* some fixes