lots of fixes, still need to finish changing name