updates from Jim Lee (Rezn8d) and other fixes