Fixed illegal code.
Improvements.