Cleaned up lots of minor errors