warnigs fix'd