Fixxed many issues