modified a bunch of stuff. mass commit incoming.