incorporated timm's fixes, final, final changes. That's it!