make it better

 This is a combination of 4 commits.