Commit 4

Some imporvements...