cleanup + fixed errors