updates to make comments work