updates, cleanup, minor fixes