Second commit

Some general corrections from the last commit. Still the initial
version.