updates from day1 and day2 testing, fix #5, fix #6