Bump sampling - style fixes, adaptive stub