fixed few issues.