removing TODO item, removing spaces from key binding sections, and
tidying a few things