Final bug fixes before it's finished