Minor fixes; cleanup

Minor commit before adding Bishop class