Bunch of changes

All of the changes I made for our use case.