comments updated, exit removed