Alignment/minor cs fixes