more changes, some meta stuff