#5: minor fixes