Fixed lots of nits