fixing commands and migrating to parameterized commands where applicable