Fixed a client bug
Some cosmetic changes
Testcases for 1-3