Cleaned up errors and added filters