renamed things, etc to fix functionality