fixes from hn comments