fixed name conflict and othe issues