Day shift commit 141030 - bug fixes

Fix issues 7,8 and 9.