partitioning, bug fixes