Open sourcing
some corrections