more updates, getting glob/watch functionality started