Small work, small fixes
Small work, small fixes