Version 1.21 Alignment and better comments

latest commit 747ae76c03
@zandegran authored