fixed few issues
fixed few changes