cleanups, fixes, begin canister rework, begin ecology