Updated builder data
Cleanup and bug fixing