fixed errors and stuff