Fixing stuff and making commands