Fixes CakeDC/tags#88, Refs CakeDC/tags#89, Documentation updates, CS fixes