small clean ups
set expand and fill to true for sw