cleaned up and fixed all changes