Minor changes... updating as restore point mostly