comments and final touches