Refactoring / Tweaks
Added padding warnings - unsupported at the moment.