fixed all bugs ever for real this time