Rewrite.

Improvements in all departments... I have come a long way in 2 years...