More fixes
Added stuff