Some fixes and start to javascript options