Mostly fixed,

odd jester bug