fixed some PreBishop stuff... still buggy