Minor, final, modifications.

Last changes, I hope. :)