Fixed bug, Doesn't need another column and filtering bug
Fixed some more.