Adding some commands, and lot of adjustments