Commented some stuff and made prettier
hackish fix for Xobjects