added some changes due to issue 45

This is just the first step as the variables have to be filled by table
data - what tables are involved?