Fix most of bill's complaints