Made some improvements, and close to being done. Just a few more bug fixes