fixes some issues, updates a bunch of things to make them saner