.. some fixes