Complete fixes for final star, add comments explaining fixes.