Various updates
Final changes