Fixed typos, plus some general stuff in MainActivity