Error checks and filters ironed out