fixed events and small stuff