Some improvements and a tester page