some final changes, don't remember now