Tried to Fix Stuff

I made some fails in fixing stuff, but I also did fix several
outstanding bugs.