some bugs fixed
Code Arregled