added logout / fixed availability