little final changes, really final now