gc fixes, adding links and minor restructuring