Fixes, improvements, new commands