many many anisbile changes, not checked for private info

Ignore-this: 281482ba1321cc40ce169d2f37b9cc1a

darcs-hash:20140515043109-836b1-e45698d7cf26f6a3a145b23fdd79cd1545896181