many bug corrected, js not done