Minor improvemnts and update libs