sir fix a lot (and break some things)
up'd jsjac