Hopefully fix some errors + new content