Fixing typos & bugs