finished environment, updated parser