updates to init etc.