Basic updates to files, fixed major crash bug!