Fix up pathing and layout
Doc updates