include LOTs of bugfixes as well todo: documentation! Change-Id: I52252ade34966d24990afd9672f38049882c3199
Change-Id: Ia4b90c75a8cf89f4069bd8984a0e0c88f9ffa832