Commit 12

Minor improvements