Issue #29: fixed some bugs, aligner seems to work, test have small bug