Fixed a few bugs, updated names