Fixing bugs.
Fixes & improvements.