Corrected few issues.