Added sanity check; Removed obsolete code
Fixed player seeking after zapping