Some better handling for variables, as well as fixing the wa reset after ramps