Town, commented more, changed some small amounts of code