incportating filter into other programs plus miscelleneous changes