log stuff fixed and quest updates
pre merge with master
merge successful