fixed command framework, added warps