[IMPROVEMENT] added some fixes and moved some commands