Commander imp. + other tweaks