added information about shapes; added alternative FSE parametrization (note that this is still a skeleton)