simplifying the JS

Signed-off-by: Torrey Rice <rice@itorrey.com>
fixing up some of the fx

Signed-off-by: Torrey Rice <rice@itorrey.com>