a whole lotta fixing - collections are working properly, and some specs and stuff