Add some more blocks
Merge pull request #201 from bobtwinkles/client_fixes

Add some more blocks