More Bug Fixes

Updated.  Hopefully removed single white or black spots.