Various Fixes.

Clipped by Voshon_