Cleaned up syntax errors for Release 7