NavFilter fixes, file cleanup and docs