Changes wait system in commands + fix command view bugs.