Fixing errors, deleting fluff