Collection reform and fixing other small bugs.