updates to functions / style