clean exit and fixed user inconsistancies
merge