fix levels; tidy a little