updated padded- class to just pad-. some variable reorganization