Some updates. still many errors