Center option and small fixes