Removed redundant comment ID, stopped links being built manually, reverted admin? to can_read? where appropriate.