- better resource relations
 - cleanups