MORE NEVER ENDING STAFF FIXES