final fixing and removing commented code..