Serveral Small Fixes