even more small fixes done. no full scenario play yet