worked out strange testing bug...still not sure what that was...also cleaned up source a bit