Fixed some issues, made others. Too annoyed to make a useful commit message.