fixed stuff so we can get back to killing ourselves
fixed everything so we can get back to business