fix add hives
fix proxy
cleaning branch