fixed js stuff