fix whitespace and add angle stuff