I made a bunch of fixes. Thanks for the feedback again. Let me know if you find any other issues with it.