done

done with few issues