Bug fixes and some cosmetic changes.
Bug fixes and some cosmetic changes.