cleaned up some testing stuff...