change logout to a private variable so only ATM can modify it. also added returns to a few paths to take care of compiler warnings