bugs fixed. now ready for remapping with mrfast