fixed various nits