typos, comments and stuff