Add comments and compute heights properly