fixes, trader included, ah update, mapupdates