Fixed things left over from the change of the uniform function.
Added convenience functions for AABBs.