Fixed double space in error message
Added fixes for remaining errors that can be fixed