Fixes and improvements.

Stability fixes, new iBuilder improvements/features.