Corrected all mapping issues. I hope.