Added errors, improved file versions