Some more crunch changes + general updates