Fixed some bugs and added padding
Merge pull request #647 from Rajia/ra553

Fixed some bugs and added padding