Optimization

Moved main-built to bundle and changed max length on address feilds