Fixed session expiration time and removed some outdated FIXME comments