Fixed minor bug, renamed things