Adds some small fixes and deletions.