renamed test to skp in draw function, improved cmd management