fix #41
fix #39
fix #40
fix #33
fix #30
scroll upd