Fixed bug, renamed some things.