Commented a few things I'd like to work on specifically