cleaning up code, minor redesigns for beaconprint merging