update and cleanup

avatar update, links update, code cleanup