a few tweaks and remove local MVEl dep