More various fixes
One bug fixed, more arise...
I can't get it to crash anymore... is that good?