Add comments and update shortcuts