Add some blobs, fix some errors.

Change-Id: I699fde66164ce3426a818a7e87fb1b4c74297475
Merge pull request #515 from mastamoon/mastafork

Add some blobs, fix some errors.