Fixes to suggestions and more spacing