some generic updates
more updates, now it works!