various updates
added for command line execution