Minor improvments and starting working on buying from neighbors