commit 3

Minor bug fixes