removed exit, updated comments