fix bug #5
update some small things