some fixes, repeat aligment option added