reorganised + fixed error in bishop-moves