cleanup and path fixes