Closes #205, #287 Change-Id: I77ca15f63e262eb0eaff7b6d74d259d30da9f823
Also fixed a few documentation problems. Change-Id: I52cfda8f04635235fabef617af482a0ce66970ea