Few Fixes
Updated From Amber Rabbit

Several bug fixes.