changed names, fixed a few bugs