address @slivingston review + other small fixes, cleanup