cleanup + library updates