Add more options to railing, code cleanup