More logging changes
removed commented code to save coredata
minor changes
Added track lines to map
Added timing logs; fixed reload bug