Small Changes and Fixes

Still crashing a lot….