Wrote more, fixed some typos, cleaned up