some minor bugfixes

Made some changes regarding mismatched annotations and a loss of the pbc configuration which occured under certain circumstances.