8th Commit

Some small changes