Bug fixes/modifications

Numerous bug fixes and modifications based on feedback from those using
the client.
Bug Fix