modified some padding and stuff