Setting comma for back-alignment, and some tweaking