dry run option
small bug fixes