Fixes
Touching up