search little more
fixed crossite attacks
fixed conflicts