small fixes to add the current working version, prepare the ids etc.