bugfixes + implementing numpad for diamond