Cleaned up, fixed server?