more changes, good stuff