Bug Fixes

Maybe I finally got them. Who knows