Added part 3 of commands, various fixes and changes