Fix broken things; add new features