More debugging. Fixing more typos