More sensible defaults. Made $baseline a variable