Comments functionality mostly in order, fixed functionality bugs