Lots o' changes

lots and lots o' changes, to tired to list them all right now