Cleaned up, updates