bugfix for pbc configuration loss
some minor changes to the annotations