Cleaned up filters, and more work on enemies