nodes were missing + some cleanup