More fixes of now global functions
Added more sample options