added padding and made some small changes