Add Gruner, small bug fixes