bugfixes, added a macro to moves.h