More ban implementation and bug fixes
NPEs are bad PEs