some general tweaks and path fixes