More improvements, wee

Fixed some defs, added some stuff