Organized code
Bug fixed.
Small changes