fix issues, spacing, remove last OYO