Some fixes and edits.

Bug Fix