More fixes and Experamenting