Fixxed few bugs