Added white-space, fixed prefixes