Added some more scenarios & cleaned up the JS