Fixed bugs and tested HTML page... Still more work to be done before stable version