Overhauls variables, adds vertical baseline