revised goals, TODO, contributing