Okay, patch updated as recomended; Patch attatched. Again, if something
looks wrong -- feel free to comment. Thanks!