small fix ups, still at line 512