made a few additional fixes, also on the modular commands