inital commit 2, typos, errors and such