Updating fork

Updating the TinyTitan fork from my master