First test, fixed some small bugs and typos