Added code to visitors, fixed some problems.