fixed js + some notes