dev164devFOUR

changed a bunch of crap