Fixes for pushed broken code :(
fixes for bad merge
Fixed no yelling
added table fix
updated no yelling script