fixed HTML generation, removed extra stuff