Align bug + clear

fix a bug + add a feature