small changes and demon bug fix