Completed it! For now. Any suggestions on changes I still need?