Updating with some on the fly fixes I had to make