Add notes, remove ugly parsing