updated
merged and fixed some homesead things (hopefully)
updated