Lots of changes and the start of UTF-8. Not a good place to commit but I haven't in so long...