Padding fixes.
Updates w/ Jonas's suggestions
Update