more fixes soon