more changes
cleaning up a mess