Add comments, remove warnings