update help messages
clean up imports