Core pr 3

Change from black hole to virtual fields and different small fixes.