more updates
Un-comment a bunch of stuff