Bug fix and final upload