first updates to the code

Ref #2162