squashed some padding bugs.