Changed my practice answer.
Miscellaneous fixes