Fix comments

Following lines are ignored if line starts with #
Move comments to bottom

Change-Id: Ib57649e8de646c45ce4169dbefd61a9ef1e3c998