First commit
several updates