First pass for basis translation (not complete...)
Fix typos