Add comments and enable services