fixed various issue with code move