typing Modes
Fixed up some stuff