misc
refactored commands