Commit 4

Minor changes and improvements