Moved log location
Updates/fixes

Various updates and fixes