fixes for <3 variables and some other small tweaks; fix opro loading