fixxed errors