libs to _includes and little tiny tweaks