Real Commit 6 - several small changes