Improved details (appearance and code)