fixed one small issue, Stil another big issue