Fixed few issues..