Cleaned up, some results