better paths and classes for home; work on #518