more changes, cleanup