Possible bug fixed...
Minor changes.