minor updates to make it work hopefully