Fixed a filtering bug and left some debuging machinery
Fixed the order of screen drawing