fix #11
fix #9
fix #10
updating times for node