Added fx, improved htmlgen