slumberface optimization and bug fix