fixed a few errors / bad names