Great suggestions from Jond! He did your homework. I could have used that in school!
IMO be careful if you are happy now, once you change one thing it will most likely soon snowball into another, then another and so on....
To quote Paul McCartney "happiness is a warm gun"