fixed more spacing issues, etc