minor updates - not solid yet