Align comments and variables, + tests for anchors