various fix
more fixes, a lot of spark in the hear, so need to be fixed