guidance edit and small bug fixes