More errors fixxed