fix

small fixes (almost complete)