fixing core elements
more core fixes