Dealing with mapping issues and various bugs.