added supervisor and fixes