Disabled some functions that mess things up--to be fixed later