some i-dotting t-crossing to fix a few bugs