Moar fixes, rearrange, append works wierdly