Made a few more changes, tested all errors -- seems to be working.