Increase data size, correct bugs