Adjust width
Add register
Fix some stuff for dist