Some minor updates

Currently still testing the code but I made some theoretical fixes for
some of our problems