fixxed bugs