Fixed basic issues, upgraded swarm, etc.

Still issue, see README.MD

http://stackoverflow.com/questions/15599616/android-layout-drawing-glitch/18070884