Few modifications done to save

Commiting so I can switch to Ubuntu and code there.