Fix #16: debug comment and move card