comments; update to v 0.21