removed debugs, better commands handling