added logout, save; little fixes