bug fix
small changes