fixed double events and size issues