move semantic matters into poists, small fixes