Defect Fixes and final stuff