lots of updates, making some things work