adding more options, fixing alignment bug