Update

Updates for various reasons. Things work a lot better now.